Re-Adds Obeah (And Valeren because Nimi) by XeonMations · Pull Request #686 · DarkPack13/SecondCity

XeonMations · 2026-02-19T21:01:51Z

About The Pull Request

Saluri healer discipline.

Armor of Caine's Fury
https://buffybox.thefinalnights.com/game/armorofcaine.mp4

Uses signals to modify incoming damage, rather than the fortitude armor datums (which I could not verify even work)

Why It's Good For The Game

Changelog

🆑
add: Adds Obeah
add: @buffyuwu Adds Valeren
/:cl:

code/__DEFINES/~darkpack/traits/macros.dm

modular_darkpack/modules/powers/code/discipline/obeah/obeah.dm

github-actions · 2026-03-04T01:50:47Z

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~7 days. Please address any outstanding review items and ensure your PR is finished - if both are true, and you have auto-staled anyway, you need to actively ask maintainers (by pinging them in the /tg/station Discord) to (re)review or merge your PR. If no maintainer responds to your request, you may wish to close this PR yourself while you seek maintainer comment, as you will later be able to reopen the PR yourself.

XeonMations · 2026-03-14T20:13:53Z

`°°° CORPORE SANO

Laying on Hands to heal someone, on/close to the wound (-> passive grab on bodypart/ if that is too hard with the Body part, just passive grab)
Third eye opens
Works on Living AND Undead
Each Health Level to be healed -> 1BP, 2BP for agg Damage (How much Damage = 1 Health Level?)

°°°° SHEPERD'S WATCH

INVISIBLE barrier 
Salubri must stand between those they protect
Ranged weapons can still attack, enemies just can't Approach
2WP to errect 
3 metre radius
those inside it at its creation "may leave and return" 
 barrier moves with the Salubri
To cross barrier: extended, resisted Willpower roll
	-> (difficulty equals the opponent’s current Willpower for the Salubri, and the Salubri’s current Willpower for the opponent)
	-> The opponent can cross as soon as they accumulate three more net successes than the Salubri

°°°°° MENS SANA (in current Version it's not mens sana, but 'unburdening the bestial Soul, which is sixth dot)

Heals 'madness'/Derangements 
2BP and  Intelligence + Empathy (dif 8)
10 minutes of uninterrupted conversation (-> 10 ic Minutes timer)
cures the subject of one derangement of the Salubri player’s choice (-> Cure brain Trauma Derangements Maybe?) 
can't cure a Malkavian of their core derangement, CAN alleviate it for the rest of the Scene (-> round??? could take the Malk hallucinations away for the rest of the 	round)
Botch -> Salubri gets the Derangement
Can't be used by salubri on themselves

`

modular_darkpack/modules/powers/code/discipline/obeah/obeah.dm

… pr/686

https://brighterly.com/wp-content/uploads/2024/11/What-is-a-radius-1-1.png

chazzyjazzy

mostly just datumizing rolls tbh.

chazzyjazzy · 2026-03-26T23:36:24Z

modular_darkpack/modules/powers/code/discipline/valeren.dm

+
+/datum/discipline_power/valeren/sense_vitality/pre_activation_checks(mob/living/target)
+	. = ..()
+	successes = SSroll.storyteller_roll(owner.st_get_stat(STAT_PERCEPTION) + owner.st_get_stat(STAT_EMPATHY), 7, owner, TRUE)


datumize rolls

chazzyjazzy · 2026-03-26T23:36:49Z

modular_darkpack/modules/powers/code/discipline/valeren.dm

+	if(successes > 1)
+		return TRUE
+	else
+		return FALSE


successes = 1 is false?

from above:
One success on this roll
identifies a subject as a mortal, vampire, ghoul, or other creature.

modular_darkpack/modules/powers/code/discipline/valeren.dm

chazzyjazzy · 2026-03-26T23:43:26Z

modular_darkpack/modules/powers/code/discipline/valeren.dm

+		var/list/mental_conditions = list()
+		if(target.has_quirk(/datum/quirk/insanity))
+			mental_conditions += "insanity"
+		if(target.has_quirk(/datum/quirk/derangement))
+			mental_conditions += "an incurable derangement"
+		if(length(mental_conditions))
+			msg_mental = "[english_list(mental_conditions)] clouds their mind."
+


else !length(mental_conditions) ? you have a case for this for diseases. not necessary but figured its worth a mention

chazzyjazzy · 2026-03-27T00:17:37Z

modular_darkpack/modules/powers/code/discipline/valeren.dm

+
+/datum/discipline_power/valeren/anesthetic_touch/pre_activation_checks(mob/living/target)
+	. = ..()
+	successes = SSroll.storyteller_roll(owner.st_get_stat(STAT_TEMPORARY_WILLPOWER), (target.combat_mode ? 8 : 6), owner, TRUE)


chazzyjazzy · 2026-03-28T00:18:58Z

modular_darkpack/modules/powers/code/discipline/valeren.dm

+// this is basically just potence 5 with stat bonuses, used potence as a baseline because of the 'makes for significant damage' wording in v20 above
+/datum/discipline_power/valeren/vengeance_of_samiel
+	name = "Vengeance of Samiel"
+	desc = "The Salubri antitribu strikes his foe with superhu-man accuracy and strength, as his third eye opens and changes to a furious, icy blue. Some Furies invoke the names of ancient Salubri warriors, while others simply close their normal eyes and let Samiel guide their hands."


... superhu-man? shouldnt it just be, superhuman? or perhaps super human.

chazzyjazzy · 2026-03-28T00:35:15Z

modular_darkpack/modules/powers/code/discipline/obeah/obeah.dm

+	else
+		living_target.heal_storyteller_health(dots_to_heal = 1, heal_aggravated = FALSE, heal_scars = TRUE, heal_blood = TRUE)
+
+// Radius - the length of the line you draw from the central point of a circle towards any point of the outer boundary, which in geometry is called the circumference.


... lol, this may be unnecessary. if someone actually was like idk what a radius is then keep it i guess. still, pretty funny.

chazzyjazzy · 2026-03-28T00:37:55Z

modular_darkpack/modules/powers/code/discipline/obeah/obeah.dm

+/datum/discipline_power/obeah/unburden_the_bestial_soul/activate(atom/target)
+	. = ..()
+	var/mob/living/carbon/carbon_target = target


casting as carbon when target_living, could runtime if used on, idk, a deer or some shit, or a basicmob

chazzyjazzy · 2026-03-28T00:42:04Z

modular_darkpack/modules/powers/code/discipline/obeah/obeah.dm

+	if(!chosen_derangement)
+		to_chat(owner, span_notice("You fail to find any traumas."))
+		return
+	var/datum/storyteller_roll/unburden_the_bestial_soul/discipline_roll = new()


Suggested change

var/datum/storyteller_roll/unburden_the_bestial_soul/discipline_roll = new()

if(!discipline_roll)

discipline_roll = new()

youre casting and storing in the constructor so only new if its doesnt exist.

chazzyjazzy · 2026-03-28T00:45:00Z

modular_darkpack/modules/powers/code/discipline/obeah/shepherds_watch.dm

+/datum/storyteller_roll/shepherds_watch/contested
+	bumper_text = "willpower"


this is what the player sees as like, the title of the roll window in the chatbox, so it's just gonna say 'willpower' lol. players can always hover over the text in the chatbox for the roll and it says what stats were used. up to you if you wanna change it

modular_darkpack/modules/powers/code/discipline/valeren.dm

LucifersCoils · 2026-03-28T01:13:47Z

modular_darkpack/modules/powers/code/discipline/obeah/obeah.dm

+				to_chat(owner, span_warning("You can't put a Kindred to sleep with this power!"))
+				return TRUE
+			target.SetSleeping(sleep_duration_length + (successes TURNS)) // 50 seconds + successes in turns
+			target.adjust_blood_pool(1) // restores a BP to the target, but if this gets abused, maybe make this depend on successes


is this BP for balancing reasons? makes sense if so, just not sure what the potential abuse is here

i envision a particularly crafty person casting this on a human bloodbag to refill their bp quicker

modular_darkpack/modules/powers/code/discipline/valeren.dm

XeonMations added 5 commits February 19, 2026 21:20

obeah 1

0a8eac7

obeah 2

b8e6ffe

Update obeah.dm

00f5134

Update obeah.dm

849ae0b

Update obeah.dm

65ea60b

github-actions bot added Sprites Sound Feature labels Feb 19, 2026

XeonMations added 3 commits February 21, 2026 11:33

DISCIPLINE_TRAIT(type)

d536cf4

obeah 2

20888d9

Update obeah.dm

ddfbb86

FalloutFalcon reviewed Feb 22, 2026

View reviewed changes

code/__DEFINES/~darkpack/traits/macros.dm Show resolved Hide resolved

FalloutFalcon reviewed Feb 24, 2026

View reviewed changes

modular_darkpack/modules/powers/code/discipline/obeah/obeah.dm Show resolved Hide resolved

github-actions bot added the Stale label Mar 4, 2026

github-actions bot closed this Mar 12, 2026

XeonMations reopened this Mar 14, 2026

github-actions bot removed the Stale label Mar 15, 2026

LucifersCoils reviewed Mar 21, 2026

View reviewed changes

modular_darkpack/modules/powers/code/discipline/obeah/obeah.dm Show resolved Hide resolved

LucifersCoils reviewed Mar 21, 2026

View reviewed changes

modular_darkpack/modules/powers/code/discipline/obeah/obeah.dm Outdated Show resolved Hide resolved

XeonMations and others added 4 commits March 21, 2026 22:20

Merge remote-tracking branch 'upstream/master' into obeah

345cb8d

Update obeah.dm

f953eaf

VAMPIRE_CLAN_WARRIOR_SALUBRI

dcd1b82

valeren

a44c33f

github-actions bot added the UI label Mar 21, 2026

Update valeren.dm

768096c

XeonMations changed the title ~~Re-Adds Obeah~~ Re-Adds Obeah (And Valeren because Nimi) Mar 21, 2026

buffyuwu and others added 2 commits March 21, 2026 16:58

fixes

49e971d

Update obeah.dm

521acbd

buffyuwu moved this from Todo to In Progress in Rebase Mar 23, 2026

buffyuwu and others added 16 commits March 23, 2026 15:31

signals > armor datums

e30590b

Update valeren.dm

847f62a

Merge branch 'master' into obeah

9a947ed

oops

ed18951

Merge branch 'obeah' of https://github.com/XeonMations/ThirdCity into…

e03d7d3

… pr/686

shepherd's watch

f5045d7

Update obeah.dm

47809ac

what IS a radius?

2c4ddc9

https://brighterly.com/wp-content/uploads/2024/11/What-is-a-radius-1-1.png

xeon and their consequences

660d037

obeah, valeren

e13896b

rahahha

61826e8

Update obeah.dm

b227e52

Update aoe_monitor.dm

e1baaf5

Update aoe_monitor.dm

75b4492

awa

bc08768

Update obeah.dm

85bd40a

XeonMations marked this pull request as ready for review March 24, 2026 23:58

XeonMations requested review from a team as code owners March 24, 2026 23:58

Merge branch 'master' into obeah

7effcba

XeonMations moved this from In Progress to Ready in Rebase Mar 25, 2026

XeonMations mentioned this pull request Mar 25, 2026

Turns on Ticked File Enforcement #802

Draft

chazzyjazzy added the Merge Conflict label Mar 26, 2026

chazzyjazzy requested changes Mar 28, 2026

View reviewed changes

buffyuwu reviewed Mar 28, 2026

View reviewed changes

modular_darkpack/modules/powers/code/discipline/valeren.dm Outdated Show resolved Hide resolved

Apply suggestion from @chazzyjazzy

0c2c7a4

LucifersCoils reviewed Mar 28, 2026

View reviewed changes

modular_darkpack/modules/powers/code/discipline/valeren.dm Show resolved Hide resolved

Update valeren.dm

9e08e20

	var/datum/storyteller_roll/unburden_the_bestial_soul/discipline_roll = new()
	if(!discipline_roll)
	discipline_roll = new()

		/datum/storyteller_roll/shepherds_watch/contested
		bumper_text = "willpower"

Conversation

XeonMations commented Feb 19, 2026 • edited by buffyuwu Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

About The Pull Request

Why It's Good For The Game

Changelog

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Mar 4, 2026

Uh oh!

XeonMations commented Mar 14, 2026

Uh oh!

Uh oh!

Uh oh!

chazzyjazzy left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

XeonMations commented Feb 19, 2026 •

edited by buffyuwu

Loading